More 'const' cleanups (and fixes, for Solaris).

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/tools/xenstat/xentop/xentop.c b/tools/xenstat/xentop/xentop.c
index f88fd267428bb49105b46f5712aef5fb0f59cf92..a2ea23a735ce9758a7b9d9cd28fe47c36191ecdb 100644 (file)
--- a/tools/xenstat/xentop/xentop.c
+++ b/tools/xenstat/xentop/xentop.c
@@ -269,7 +269,7 @@ static void print(const char *fmt, ...)
        if (!batch) {
                if((current_row() < lines()-1)) {
                        va_start(args, fmt);
-                       vwprintw(stdscr, (const char *)fmt, args);
+                       vwprintw(stdscr, fmt, args);
                        va_end(args);
                }
        } else {
@@ -283,7 +283,7 @@ static void print(const char *fmt, ...)
 static void attr_addstr(int attr, const char *str)
 {
        attron(attr);
-       addstr((const char *)str);
+       addstr(str);
        attroff(attr);
 }
 

diff --git a/xen/common/gdbstub.c b/xen/common/gdbstub.c
index de3ba1f40f1de1af57333cfc6b01a6c6270976a5..8c863080e04d7e96f7dbaeab24fbf338245af270 100644 (file)
--- a/xen/common/gdbstub.c
+++ b/xen/common/gdbstub.c
@@ -382,7 +382,7 @@ gdbstub_detach(struct gdb_context *ctx)
 static int 
 process_command(struct cpu_user_regs *regs, struct gdb_context *ctx)
 {
-    char *ptr;
+    const char *ptr;
     unsigned long addr, length;
     int resume = 0;
 

diff --git a/xen/include/asm-x86/bitops.h b/xen/include/asm-x86/bitops.h
index d3d3b5dfbcc8046f43d276edc6fdec471c9185db..8cb4693fab779bea3a1cd162ab9d77a7997c3201 100644 (file)
--- a/xen/include/asm-x86/bitops.h
+++ b/xen/include/asm-x86/bitops.h
@@ -23,6 +23,7 @@
  */
 
 #define ADDR (*(volatile long *) addr)
+#define CONST_ADDR (*(const volatile long *) addr)
 
 /**
  * set_bit - Atomically set a bit in memory
@@ -253,7 +254,7 @@ static __inline__ int variable_test_bit(int nr, const volatile void * addr)
        __asm__ __volatile__(
                "btl %2,%1\n\tsbbl %0,%0"
                :"=r" (oldbit)
-               :"m" (ADDR),"dIr" (nr));
+               :"m" (CONST_ADDR),"dIr" (nr));
        return oldbit;
 }